Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contraband Drop 1 - Narcotics 1 #466

Open
wants to merge 58 commits into
base: master
Choose a base branch
from

Conversation

KittenColony
Copy link
Contributor

@KittenColony KittenColony commented Nov 13, 2024

A new collection of PRs. Contraband.

About the PR

Adds several new items and sources for narcotics, including brand new ones with Unique* effects!

  • New Cigarettes
    Hack into a shady cigs dispenser, and activate the contraband catalog to enjoy 6 new packets and 1 new brand!
    New Cigarette Brand ~ Garden Mirage. "Life's a Mirage, see through it."
    New unmarked packets! Unknown, unnamed, unbelievably good!

  • New Pill bottles
    Hack a Chefvend to get a hit of joy to keep you going, two bottles of Happiness.

  • New Injectors
    Hack a sec-vend to get a leg-up over rebels and runners, new Dynaxoline autoinjectors give a burst of energy for ten seconds!

  • New Chemicals
    Dynaxoline, an attempt by Nanotrasen to create a military stimulant for extended engagements, shelved after Donk Co. came out with Hyperzine, the recipe has been made publicly available recently.
    Mindleaf, a questionably legal plant with an intoxicating, toxic sap, which can be refined into a plethora of drugs, both potent and pleasant.

Why / Balance

Characters might have a background with substance abuse, currently, the only real way to get these is through chemistry, spaceshrooms, maintpills or the occasional admin-run dealer events. This PR adds new sources for people to get their fixes, while also giving Security something to track down and interact with.

Technical details

Primarily YAML code, does include several new reagents, reactions and FTL files, vending machine changes not name-spaced, are tagged with [# _CD]

Media

:todo:

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
:todo:

@KittenColony
Copy link
Contributor Author

PR made to find issue with Dynamoxine using tests

Copy link
Contributor

github-actions bot commented Nov 13, 2024

RSI Diff Bot; head commit ce0c260 merging into 4eb12af
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CD/Objects/Consumable/Drinks/strayglass.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/_CD/Objects/Consumable/Smokeables/Cigarettes/Packs/darkgreen.rsi

State Old New Status
closed Added
equipped-BELT Added
inhand-left Added
inhand-right Added
open Added
trash Added

Resources/Textures/_CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi

State Old New Status
closed Added
equipped-BELT Added
inhand-left Added
inhand-right Added
open Added
trash Added

Resources/Textures/_CD/Objects/Misc/Contraband/drug_packets.rsi

State Old New Status
brown_icon Added
green_icon Added

Resources/Textures/_CD/Objects/Specific/Chemistry/pills.rsi

State Old New Status
inhand-left Added
inhand-right Added
pill Added
pill1 Added

Resources/Textures/_CD/Objects/Specific/Hydroponics/mindleaf.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added

Resources/Textures/_CD/Objects/Specific/Medical/medipen.rsi

State Old New Status
dynamoxine Added
dynamoxine_empty Added

Edit: diff updated after ce0c260

Copy link
Contributor

@DrSmugleaf DrSmugleaf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welds asked me for a PR review in voice chat

Resources/Prototypes/_CD/Reagents/narcotics.yml Outdated Show resolved Hide resolved
@KittenColony
Copy link
Contributor Author

motherfucking GOD, HOW?

@dffdff2423
Copy link
Collaborator

dffdff2423 commented Nov 13, 2024

ping me on discord when this is complete and ready for review

@KittenColony
Copy link
Contributor Author

ping me on discord when this is complete and ready for review

won't be for a while, I might actually have to do split PRs to make it not... cross the 1k threshold

@KittenColony
Copy link
Contributor Author

GOD FUCKING HELP ME I HATE CRAFTING CODE

@KittenColony
Copy link
Contributor Author

fucking what

Copy link
Contributor

@MilonPL MilonPL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to have a step at the empty node, i used the screwdriver but whatever, you got it from here I hope

Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/_CD/Hydroponics/seeds.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_CD/Reagents/narcotics.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_CD/Reagents/narcotics.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_CD/Reagents/narcotics.yml Outdated Show resolved Hide resolved
@KittenColony
Copy link
Contributor Author

1.0 is marked as complete and ready for review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants